Bug fixes, adding specs