Dev

minor fixes.