Fixing a few bugs, and poor UX moments. Aiming for update on Friday!