bug fixes and work on page class