fixes and tweaks. works well, scales ok