Fix bugs. Add staff number.