Improved logging; fixed neck handlers issue