solved more bugs & watch out for prints