Finally fix all bugs!