property updates and some minor flow updates.