moustly some small fixes