Updates, spec cleaning