Many changes from debugging on 2/19