Bug fixes, icon
Added logging