fine tuning some annotation positioning and logic.