cleaned up and fixed the failed last commits