correct bugs; (not working yet);