Cleaned up code and added a few more steps
Fixed bugs and added a few more steps