fixes + some pages