tweaks to requirements and text layout
merge upstream