Removed unused function
Fixed the fill kind
Minor fixes to grid (unfinished)