more annotations
more annotations
get rid of more legacy code
down to three warnings