Made some small tweaks and added a bunch of new tags