Implement marker creation and fix some things