Still some reflection errors; but mainly fixed