Cleaned up header, fixed specs.