Build 36

Fixes and improvements throughout.