more updates/fixes