Added in fixes for a fe small style things