bug fixes, and icon