Lots of small corrections
working on assignment 3
Merge with bruno's and oliver's changes