Improved help, fixed minor bugfixes