Fixed bugs, cleaned code, and implemented several new features
Fixed some more bugs