removed tutorial stuff, renamed things to make more sense