Minor updates

fixing some slowdown areas, removing useless commented stuff, general
cleanup