Corrected some class constructors to ensure variables are properly initialised.  Also changed some variables to consts.