Fixed tutorials and added cmd line options