stweaks: fixes and clean-up