Working cd, arguments, misc cleaning