HaroldT: New icons, map functionality, better errors.