Small fixes.

Now we ready to start dev!!