Cleaned code a bit. Successfully re-ran Tnavi into demo.