finished some stuff up i think