Last minute Beta 4

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>