cgame: some tweaks, clean up