reverted some things
fixes