Various additions and small fixes