Minor fixes. Still pre-pre-alpha