small fixes, rename disabled field to active