some small fixes and updates