Overhaul

Fixed a bunch of stuff and added some features.