Added select.night + fixes