Fixed bugs, added numerical feature