minor fixes, range, TODO updated