fixed gameplay bugs, ready for portfolio
resolved merge conflicts