efficiency upgrades

almost entirely rewritten, options still the same