whoooooole lotta fixes.