fixed most problems