bug fixes, smoother transitions