some componentization and cleanup
Merge branch 'master' of http://github.com/gebhardm/flmlocal