fixing ids
disabling enabling map spot
lot of changes ;)