format code, ready for rc1
update TODO