more works towards beta 3

some smaller tweaks and bug fixes