add a couple more strings for various errors
more fixes/cleanup