Misc changes

like comments