Enhance help and bug fixing