round two updates
cleanup, database changes