FitAssist - Minor tweaks and bug fixes