Revert "some fixes"

This reverts commit baefc2f0c3f125dc9d20939a0002a99c2342522e.
Beau016