fixed many things need individual pages