Refactor values and various corrections