Edited several files for deployment