more fix
lots of tweaks