Better logs with level checking; fix