a) Fixed a bug.
b) Some stylistic improvements.