Now works with updater, fixed a few small bugs