more helpers. several bug fixes and typos