updates and fixes for 0.0.2