Develop

rtbiz changes and bug fixing