2D GPU version added, some uncrustify improvements