changes to page loading, changes to add and find, and a few other changes