adds new annotation form
cleans up some stuff