Fixes for final version of gameplay