some updates and changes

names changed, lower to upper case changes, etc.
selector elements not unbounded anymore