added more values, and made some fixes