2 bugs eliminated