Adding some organizational features so it''s easer to keep track of clues.