Fixed bunch of minor things