Fixed some basic logging issues and some inconsistancy