feature specs improved and passing