Woohoo changes/cleanup

Edited my stuff