sync w/ my changes in kate.git
update