Fixed Queue-bug + minor changes