adds better help; bugfixes