Update general module | minor fixes