fixes in assessment flow