two bugs found and start fixing