Tweaked some values and fixed messy code