some fixes and adds