clean up + fixed volume problem when at 0