A little more work on character gen