some updates
complete