Improved specs; fix