switching to use constants file; miscellaneous
Merge branch 'master' of https://github.com/dhadfieldmenell/lfd