Fix lots of tweeks @Huskehhh did. :)