couple of tweaks and fixes here and there