Updates #2, cleans up