Some tweaks as I put the library into action.