Made a few additions to give a more complete feel to the system