more things, but many specs still broken