fixes and minor changes