range support, bugfixes