Final Threesome for Eric, small fixes