Requirements polishing/bug fixes.