Improves functions

Improves back calls and
fixes named functions.
Refactors regex.