some fixes, end of work day commit