Working on
fixes a few issues