Code cleanup.
Fix for patterns.
Introduce default machnism if someone has an incomplete properties file.
Reorganisation of constants.
Comments and whitespace updates only.