Minor changes and polishes
Finished product yeeee