Bugfixes, nei fixes, deletion of deprecated stuff, etc.
Derped the API, fixed
Merge pull request #17 from mak326428/MajorCleanup

Merging what's currently in there