More small changes and fixes.