bug fixes, new icon, code cleanup
more fixes