small code improvments and moving toward updating title