more good fixes and adds