Made a few changes and updated more pages