Fixed a few grid calculations
Added new demos