Fixed binding and improved a bit