clean up and updates to main shiny. 10/3/14 SL