bug fixes...

bug fixes, and icon thing