few updatesm still in progress...