Fixed minor things that weren't working