removed printfs
some changes