More fixes+formatting :)

missing 's from require and some formatting cleanup (i hope)