misc. bug fixes and tweeks, general polishing.