Update except syntax,
fix some line ends