clean-up, enable function, more fixes