Minor fixes and improvements.
Bumping version number to 2.5.5.