Fix some stuff to my liking