Misc
misc
made a few changes