added fixes, and kernel