got rid of errors, need to change some values