Beta 1c

Many bug fixes