cleaned up compensation code
Merge commit 'ac9c612fb3e3233b6d4fdd270975df4b0fc7c810' into rspelling-develop