Added more comments and cleaned some stuff up
Merge branch 'master' of https://github.com/mjshiggins/OSsim.git