different fixes, beginning 'then' refactor