Updated a variety of different things -- please see my comments and follow them through.