cleanup
small fixes, %%% OK %%%