grid improvements and small fixes