more smoothness and bug fixes