Fix a few longstanding bugs, bring a couple methods in line with function defintions