Add many amazing improvements