fixes
update on many things