More tidying up and completion of the core Flash classes