Various bug fixes and some name changes
Updates to tutorial