Add comments and update paths