Misc changes

yup