adding code dropdown
minor cleanup
Fixing doc
Manually merging