fixes and improvments