added header, some other changes