Minor modifications and finishing finding stuff, censor remains