master
Fixed errors a bit