few filename changes, typos, and other small stuff