New entries + fixes