Pre-pre-Alpha Unstable

Some mo' minor fixing