simplified
tweaking:fix
separate single extend from group extend statement
remove some unnecessary dirs
resotre the option label and option assoc for olevel:fix
clean:fix