I am crazy and bored, just a few minor tweaks to cleanup dealloc and such