supporting Android better, for no reason really