More changes... pre-alpha version.
Little fixes of..