synapse fixes
Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new