Help message fixed. Other minor bugfixes.