More visual and gameplay fixes