minor changes and big-fixes