Cleaning up adding some fixes