standalone generator and various tweaks