Revert "broken commit don't push to this"

This reverts commit e6bb4976560878f35b293d887fc2bc676de90487.
minor fixes