Final commit for the evening
Actual final commit
fixed a memory leak (oops)