Update logic based on feedback from CfE and improve some specs