G#M:32 small changes