renamings
Merge branch 'PrinceDev'
Merge branch 'master' into PrinceDev
small different changes to LFC

updated comments and tidyed up code
Merge branch 'PrinceDev'