small updates; not working yet