Add more bug fixes

Notably, fixing Grid initialize.