Early-Alpha-1.2.1

Some small changes.