added icons, minor bug-fixes