Fixing various issues

first PR of the semester woo