- Updated some functions, extras and exports