Code cleanups, debug icon added.