rshell.cpp done more correctly now