third big commit.. so many improvements..