finished some stuff