Some fixes + OR correction

I made mistakes on prefixes and suffixes
Or method is now more controlled and easy to use using "parts" that are joined at compiletime