More small fixes, additions and minor changes.