some fixes, solving for guests