Fixed some things so they work real good