various fixes and page additions