non-study project bugs fixed