satya - bug fixes

pendingvc to view