Fix timeout, add <normal> tag to !kill