Some fixes + improvements (Vector) + code reformatting