Refactoring, new help messages, general bug fixes.