In Progress

Small Flash fixes needed