Minor ehnancements.