adding more pages and fixing bugs