added specs; fixed some issues subsequently