added non-sport entries as annotations
misc adjustments
various adjustments and extensions regarding annotations