monday fixes and stuff