Fixed errors, added pages