fixes and add