Added more features, updated existing ones.