tons of fixes + view change