all done, comsetic stuff remaining