Uploading bugfixes and tons more

This pull fixes #38 #36 #34. Hopefully fixes #22