Added Pages and fixed other minor errors