Rename
Add tweaks and remove some hardcoded stuff