First draft of error capture, minor tweaks to interface