small fixes and additional specs