Added watch and cleaning up some lintians