Finished arguments and better tag handling