Some changes

Yeah; see above...