Issues #6, #12, #13

re-work of wait list handling