Update to 1.6

Minor bug fixes, added the ability to display the grid