Just some random Fixes + standardize log info format