Added code highlighting; fixed up error handling