All fixes on gameplay are done