Added 'magic', 'sigh' and 'toilet'. Also improved several codes.