finished refactoring data binding system
minor adjustments