cleaned out many useless sets and added some comments