More links and command line paramaters