further simplifications
fix silly error and merge conflict