some monor fixes AND newguest generation