smoother transitions + bugfixes