Fixed s few typo / bugs