untested fixes- additional fun!