Prettied up everything and fixed some bugs