more bugs (checked with ta)