cleanup, fix Range issue