renamed variables, added toggle checkbox for boolean fields