Made things neater, and finally fixed queueing