Some minor changes
Test package