added output option for build command + cleanup