clean up makemagic
fix container deps
caching is good for the soul