fix all those things #3