Update marker model. Use private methods in module. Update bindings? Some cleanup