updates & cleanup
state change 201303040738