Added markers & cleaned options.
Updated README fixed stuff.
Cleanup.