addresses all remaining review comments