poi
poi copied to clipboard
refine int cast long
applied some of these changes - rebase and see if you want to get the rest merged