Added a ton
cleaned up some extra code