Added and fixed logging statements

closes #36