found a few issues and fixed.