epic commit that fixes stuff

title says it all