Fixing bug & changing packaging