Cleaned up my code, added Author tags and some comments for confusing methods, handled that issue I was saying wasn't completely working