fixes
add a whole lotta stuff