More customization, fix teleport