fixed most errors and did ui update
fixed conflict