Tweaks & updates, rename some functions, now all functions run again