various little fixes
proper func logging