Some fixes
First prototype