misc fixes, further explanation