small updates, rewrite page ready