Cleaned up some stuff
more checkers and stuff