fixes
fixes for new study flow