fix mistakes, fix position of stack-variables