Completed

A few minor jobs