Some cleaning up and fixes