Fixed several errors..