Fixed a few issues, and this could be a good release for testing