updated various issues
updated rhosimulator
fixed merge conflict