Tidied up parameter ordering.
Wired other bus operations back in.