More fixes.
Added function binding.