Added my name to stuff, fixed some spacing