Added more components to the simulator

Also, I should really document the simulator at some point. Not after
a week-end of writing and updating docs though.