Removing old debug code
Finer grained dev switch for markers only
Give the DB a bit more time to catch up
Some more image position improvements