Last fixes & Good night!