some additions for Grid and small fixes.