Grid hooks, minor internal grid fixes and property handling

Also many many whitespace errors