feature: make more things work