simplifiered some methods and changed messed values