few minor fixes to avoid crashes + improved help