some fixes and updates