Some fixes and comments

The final is near, it already compiles :)