Moar updates. Please note that this is still not "stable."

Signed-off-by: King Lemming <kinglemming@gmail.com>