added some stuff; removed obsolete stuff