Closes #21 and #24, more logs