rebrand as zwm, and code cleanup