fixing the remaining bugs