Fixed building, more work on queueing and a little reformatting