removed Nini junk
fixed a few issues