clean up dec and bugs