fixed potiential visibility issues
added timing support, closes issue #1