Finished queue system and other minor stuff