Lots and lots of changes - time to stop prototyping and start testing; Update executables with small improvements.