some works and updates...