attempting to fix a few issues