fixing general issues