Updated 

Some fixes.