General cleanup of code and added more informative log messages. Successful run of s1 & s2 on Tnavi. Ouptut in run-output-06.