More bug fixes, and application flow coming to shape