Cleaned up some stuff

Still need to make a few decisions before we can progress, and I want to
find out what's causing the compatibility issues with andrews comp