added entries and disabled some not-yet-functioning entries