Update Logger, fixed some little bugs