fixes, added return, long int to large values representation