Major bug fixes, helpers simplified