fixing stuff for the real world