added some of the important stuff