updated a whole lotta stuff