Added #252, #262, #263 to CHANGES, also minor cleanup.