fixed alot of bug from previous push
fixed alot of bugs from previous push
....