bug fixes and added icon