major fix ups