queues and init file fixes
merge