mostly example page update + some fixes