corrected some static values