Various bugfixes
Merge pull request #13 from ShadauxCat/Integration

Various bugfixes