fixes and minor updates