Removed GQL, cleaned up code, minor improvements and bug fixes, added ASDocs