some cleaning up of code/pages, worked with jason