uncomplete fixes for this weeks bugs