finishing some stuff