updates & clean up.