Huge improvements

need to sleep)
enough nocturnal coding))))