Merge pull request #529 from leider/master

minor cleanups for waiting list moved to resource
refactoring