setting up tutorial and some bug fixes