some changes. incomplete commit because of computer problems