Fixed stuff and implemented the new tags