Added Logger and log sets, as well as better checks

Thanks to Rich for the better checks.