fixing a few issues now works