Add game point generator + fixes