stashing
fixed log issues (hopefully)