added sugar, some fixes