Moar fixes
moar fixes, last
Another wave of fixes
Order methods alphabetically