Fixed and added more tags