Various bugfixes
Merge pull request #13 from ShadauxCat/Integration

Various bugfixes
Merge pull request #14 from Present-Day/Integration

Integration