fix huge security problems