annotations minor improvements

write all non-null properties (including false)
order by start and end