A lot more changes after techwriter review #484