#2 bugfixes task queue