better errors, and fixed some things
killed singly