bug fixes, finalizing game