Small changes; cleanup, unsuccessful map