fixed alot of issues