added more sorts, fixed spaces