Faster marker creation
cleaned up and documented