Update with many minor changes and bug fixes, uploaded for review.