Adding tag editing and other refactors.