fixes and improvings