fixing last
memleaks
another memleak plugged
cleaning up
removing redundant files
more cleaning up
some further cleaning up