Start adding code to display stacks/counts...

and some other changes