Moar, updates, fixes