all done, comsetic stuff remaining v 1.1