Revert "fixes+additions"

This reverts commit 6d05a2e64cf16fa515bd175f7c783a0602e2c27c.