Ken dan fixbugs

Implemented Shadi's review notes and fixed lots of bugs!