Fixed some binding issues and added other issues