cleaning up and fixing label binding