Fixing the following issues:

Issue 88
Issue 87
Issue 86

Along with some slight fixes