Revert "Fixes and new"

This reverts commit e32fd9be0c4fb2c5e8fe24ff02fba6f17ee80290.