Underp and fix some stuff. Works nicer now.