Minor bug fixes, stacking problem still exists