Add some bugs in the STS

There are a couple of issues in here that are giving me freedom, I've now rectified them.