fix features, clean mess