last big bug fixes