Various updates

Update and optimize some helpers/functions
Bump version