More clean up, added some more things