More bugs discovered, some fixed