Added new logs and fixed minor bugs