Logger class and some minor changes