fixed model inconsistencies

also changed bundle id