Slight modifications and bug fixes.

[branch: development]