A load of changes and small fixes...