updates and fixes
finish v 0.0.1