last changes before submission. Needs more work on appearance and testing