fixes and adds