code polish pre release, first iteration