new page added + some other fixes