small improvements
First pass finished