Fixed up a small bug with the basic version + cleared out a lot of the guff