fixes and minor