fixes + initial configuration