Bug fixes, java is done flex needs testing