removed/changed some prints