var_unset() added, plus cleanup and bug fixes