minor bugfixes / tweaks from live test