Lkrugen dkendry

Fixed bugs, issued closed