Update flashls with mangui's master