Started fixing a few things, taking in Will H's C++ knowledge
Added deque and brief tidy up