more flash, some cleanup