minot changes
minor changes
fixed bug with marker locking