Fix broken formula + add couple more features
16 files changed