Fixes And New Modules