Fixed errors. Peter and Alex now merged.