added and fixed alot