about to merge

changed a few files