fixing some errors
merge