Some additions and small fixes