Fixed some bugs.
Will have to make tags non-numeric… a big mess...