shoving code...
some updates...