comment/code cleanup. and yay fragmentation.