Improvements

Memory improvement and bug fix.