more work
fixing short names