sane defaults / more bug fixes