Merging in polish functionality to master

SPIRIT. BOMB.