fixes with render & module structure