stu's suggestions

Signed-off-by: Thomas Yuill <thomas.yuill@gmail.com>