minor changes + add stack collections

(implementation not finished, not tested