Spelling/grammar
merge frank's spelling/grammer stuff