Fix3

add more fixes to the module / fix some hardcoded things