fix for queueing of steps
comment cleanup