Minimal improvements. Introducing short int
This fixes the huge memory footprint (unneccessary task group allocation)