final touches to finish v 1.0