Removed update from github code
Made a lot of small changes to finally get it working
Consider this the first working version pre-signo