Organizing the queue now works, several bugfixes etc.