- fixes and improvs