more annotations
migration plus derp-fix