Added Clear(), Rebind(). Minor naming changes.