More work done
Fixed errors