deadlink more light and some bugs corrections