Made some fixes and progress towards responsiveness