Did some minor changes