Made a programmatic update that cleans up the code a bit and should remove the bugs some users found.
