bugfixes and icons!