more small fixes, fine tuning