rs bug fixes, more testing needs to be done