removed sugar dep and fixed a few more things