couples of changes and fixes