Several small gameplay related changes