Few fixes, expand game capabilities