fixed OTHER stuff