Minor fixes + progress