all current tests are green now. small beautifications