mainly loads of egghunt fixes