more bug fixes; two way data binding working