-fixed stack bug
-MERGE. fixed bugs