Corrected some tabs and added more generic messages