closes #74   small changes in decoder