updated kernal, improved calculator