Adapted the spacehandlers to the dash/underscore change
Fixed one dash/underscore thing
Fixed a dash/underscore thing