Overall improvements, still in alpha