Fixed up some bugz