simple bug fixes, this is still a pre release commit