fixes + some hardcoding removed