Updtated values and bug fixes.