Various bug fixes, more work on Ink