feat: general improvemts