small changes, there is a memory problem i need to hunt down, but it isnt causing any problems outside of valgrind complaining