New working, minor fixes