Pushing info of what I want to work, and some more cleanup