Pull requests merged; error checking also improved