Fix bug and log moar