Minor fixes and renames
Fix non-integer cell sizes