Some more ability changes. #78 #376