making some changes, fixing code.