Thoroughly tested forced partial assignments.
Replaced deprecated functions with well-structured alternatives.
Continued replacing deprecated functions.
Merge remote-tracking branch 'origin/nathan' into nigel2