fixed alot
merge