merged ui branch and quieted console logs