multiple fixes and improvments