Cleanups and added some more info