rebased some stweaks function, some cosmetics modifycations