Merge pull request #96 from DMagic1/dev

Fixes #93, #88, #79, #47, #32, #30, #29, #19, and #1 hopefully.