Added icons and bugfixes.
Cleanup.