all fixes and changes