Bug fixes and usage re-formulation