Last issues for release. Logging not working properly yet, however.