fix few details, stacks