combining lines, checking for * as a separate token, other changes