bug fixes and cleanup in mvaTree