rejiggering how annotations work
Merge branch 'feature-annotationsfix' into dev
removing unnecessary code kit modified js files