fixes several