Misc Changes

A few miscellaneous changes that have been done, nothing significant
however