[#88][#66][#76]More Corrections