#30 small corrections