more fixes for spaces
order of annotations