added timestack demo and did some cleanup