Commit 33. (Beta Candidate)
Small bug fixes including for #153