merge pl0x

cleaning out the minor commits on my branch before I start GUI work