Magically fixed itself, cleaned up commented code