fixes and new pages