Stability and bug fixes. Probably good enough for an alpha release