FinalV2.1

Fixed and tweaked a few things