Fixed some nice stuff