Fixed latest issues, ready for simulation.