few fixes - and it compiles :DDDDD