Update 1.3.4

Fixes #9

Changes: lots

Re-anranged alot of stuff and cleaned up
Fixed some bugs here and there