renamed directories/added variables
fixed typos