Fixed small bugs in lead up to first simulation.