Some minor fixes & rename package