last few amends

Ready for code review and merge.