Some small fixes. Begining testing