Fixed up some errors and stuff with page discovery