cleaned up some responsive and refactored some mixing