lots of tweaks (once again)