few changes, kernel and make