Updates to dao, jsp, controllers