Added info window
Fixed merge conflicts
Fixed merge conflicts
map improvements
fixed merge isyus