Bug fixes 2

more bugz