Add more games & code cleanup