Added a bunch of neat stuff