Update of default values for some option constructions + added end if and end case closing of if and case blocks
Update of default values for some option constructions + added end if and end case closing of if and case blocks