made things nicer, made things work