syntax fix for fedora template; got ubuntu 10.10 working; modified thorfile to start making a nice CLI