fixed breaking changes with code from tut
things