Small changes to SW code

[LoveleenB-M]

I made a few changes to the SW code I have been using over the last few months, now inputting these into core.