Add option to delete marker.
Add some finals.