Logger added, warnings fixed