small annotation fix.
partially removed toJaxb method
get reverted a bit to decrease number of selects needed to do modify object.