final fixes before starting with tooling