improvements @ #1, #2