Updated version
Fixed several errors