Minor work on gameplay and some refactoring here and there.