merging with difficulty record
updated layout
more updates
cleaned up interface for tools
updated map
updated2
fixed latest issues