Some logging bugs, rest is working