Lots o' Bugfixes
fixes #247
fixes #246
fixes #245
fixes #244
fixes #241