Some fixes... good shape!